Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Nov 2011 08:26:58 +0000 (00:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Nov 2011 08:26:58 +0000 (00:26 -0800)

Trivial merge